bitkeeper revision 1.1691.1.7 (42a6d8e19C3UPsmlA3u--9L4iY559Q)

Integrate virtual firmware into the tools build system.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index d996d45a72308694393a03a0ef3ee4ef90533b8f..abb31ab8179aed16c90d2b26c50eb9d4358ec37a 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -92,6 +92,18 @@ tools/blktap/xen/*
 tools/check/.*
 tools/cmdline/*
 tools/cmdline/xen/*
+tools/firmware/*.bin
+tools/firmware/*.sym
+tools/firmware/*bios/*bios*.txt
+tools/firmware/*/biossums
+tools/firmware/rombios/BIOS-bochs-latest
+tools/firmware/rombios/_rombios_.c
+tools/firmware/rombios/rombios.s
+tools/firmware/vmxassist/gen
+tools/firmware/vmxassist/offsets.h
+tools/firmware/vmxassist/roms.h
+tools/firmware/vmxassist/vmxassist
+tools/firmware/vmxassist/vmxloader
 tools/gdb/gdb-6.2.1-linux-i386-xen/*
 tools/gdb/gdb-6.2.1/*
 tools/ioemu/config-host.*

diff --git a/tools/Makefile b/tools/Makefile
index 95e8989d4c63914035921bb8be615da0a0883a66..7f578b68806d5ad0f4baa216812a94b517141ce5 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -10,6 +10,7 @@ SUBDIRS += python
 SUBDIRS += xcs
 SUBDIRS += xcutils
 SUBDIRS += pygrub
+SUBDIRS += firmware
 
 .PHONY: all install clean check check_clean ioemu eioemuinstall ioemuclean
 

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index b80cac27fc2d3e550141b3a4cb3242f513336eaa..2c92fbe272d42974b43e8a2c5c1513862118f2a4 100644 (file)
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -1,6 +1,9 @@
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
+TARGET      := vmxassist/vmxloader
+INSTALL_DIR := $(DESTDIR)/usr/share/xen
+
 SUBDIRS :=
 SUBDIRS += rombios
 SUBDIRS += vgabios
@@ -8,18 +11,24 @@ SUBDIRS += vmxassist
 
 .PHONY: all install clean
 
-all: 
-       @set -e; for subdir in $(SUBDIRS); do \
+all:
+       @set -e; if ! `which bcc 1>/dev/null 2>/dev/null`; then \
+       echo "***********************************************************"; \
+       echo "WARNING: Install dev86 package to build firmware!"; \
+       echo "         (http://www.cix.co.uk/~mayday)"; \
+       echo "***********************************************************"; \
+       else \
+       for subdir in $(SUBDIRS); do \
                $(MAKE) -C $$subdir $@; \
-       done
+       done; \
+       fi
 
-install: 
-       @set -e; for subdir in $(SUBDIRS); do \
-               $(MAKE) -C $$subdir $@; \
-       done
+
+install: all
+       [ -d $(INSTALL_DIR) ] || install -d -m0755 $(INSTALL_DIR)
+       [ ! -e $(TARGET) ] || install -m0644 $(TARGET) $(INSTALL_DIR)
 
 clean: 
        @set -e; for subdir in $(SUBDIRS); do \
                $(MAKE) -C $$subdir $@; \
        done
-

diff --git a/tools/firmware/vgabios/Makefile b/tools/firmware/vgabios/Makefile
index f510dbc47548acbc13b332ba3383c66862d9183f..929d882e72d1cb67d65692f853ce63fbe4a664b3 100644 (file)
--- a/tools/firmware/vgabios/Makefile
+++ b/tools/firmware/vgabios/Makefile
@@ -1,5 +1,3 @@
-SHELL = /bin/sh
-
 CC      = gcc
 CFLAGS  = -g -O2 -Wall -Wstrict-prototypes
 LDFLAGS = 
@@ -16,13 +14,12 @@ VGABIOS_DATE = "-DVGABIOS_DATE=\"$(RELDATE)\""
 
 all: bios cirrus-bios
 
-
 bios: biossums vgabios.bin vgabios.debug.bin 
 
 cirrus-bios: vgabios-cirrus.bin vgabios-cirrus.debug.bin
 
 clean:
-       /bin/rm -f  biossums *.o *.s *.ld86 \
+       rm -f biossums *.o *.s *.ld86 \
           temp.awk.* vgabios*.orig _vgabios_* _vgabios-debug_* core vgabios*.bin vgabios*.txt $(RELEASE).bin *.bak
        rm -f VGABIOS-lgpl-latest*.bin
 
@@ -42,7 +39,7 @@ vgabios.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetables.h
        sed -e 's/^\.text//' -e 's/^\.data//' vgabios.s > _vgabios_.s
        $(AS86) _vgabios_.s -b vgabios.bin -u -w- -g -0 -j -O -l vgabios.txt
        rm -f _vgabios_.s _vgabios_.c vgabios.s
-       mv vgabios.bin VGABIOS-lgpl-latest.bin
+       cp vgabios.bin VGABIOS-lgpl-latest.bin
        ./biossums VGABIOS-lgpl-latest.bin
        ls -l VGABIOS-lgpl-latest.bin
 
@@ -52,7 +49,7 @@ vgabios.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h vbe.h vbe.c vbetab
        sed -e 's/^\.text//' -e 's/^\.data//' vgabios-debug.s > _vgabios-debug_.s
        $(AS86) _vgabios-debug_.s -b vgabios.debug.bin -u -w- -g -0 -j -O -l vgabios.debug.txt
        rm -f _vgabios-debug_.s _vgabios-debug_.c vgabios-debug.s
-       mv vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
+       cp vgabios.debug.bin VGABIOS-lgpl-latest.debug.bin
        ./biossums VGABIOS-lgpl-latest.debug.bin
        ls -l VGABIOS-lgpl-latest.debug.bin
 
@@ -60,9 +57,9 @@ vgabios-cirrus.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
        $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS $(VGABIOS_DATE) > _vgabios-cirrus_.c
        $(BCC) -o vgabios-cirrus.s -C-c -D__i86__ -S -0 _vgabios-cirrus_.c
        sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus.s > _vgabios-cirrus_.s
-       $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios.cirrus.txt
+       $(AS86) _vgabios-cirrus_.s -b vgabios-cirrus.bin -u -w- -g -0 -j -O -l vgabios-cirrus.txt
        rm -f _vgabios-cirrus_.s _vgabios-cirrus_.c vgabios-cirrus.s
-       mv vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
+       cp vgabios-cirrus.bin VGABIOS-lgpl-latest.cirrus.bin
        ./biossums VGABIOS-lgpl-latest.cirrus.bin
        ls -l VGABIOS-lgpl-latest.cirrus.bin
 
@@ -70,9 +67,9 @@ vgabios-cirrus.debug.bin: vgabios.c vgabios.h vgafonts.h vgatables.h clext.c
        $(GCC) -E -P vgabios.c $(VGABIOS_VERS) -DCIRRUS -DCIRRUS_DEBUG $(VGABIOS_DATE) > _vgabios-cirrus-debug_.c
        $(BCC) -o vgabios-cirrus-debug.s -C-c -D__i86__ -S -0 _vgabios-cirrus-debug_.c
        sed -e 's/^\.text//' -e 's/^\.data//' vgabios-cirrus-debug.s > _vgabios-cirrus-debug_.s
-       $(AS86) _vgabios-cirrus-debug_.s -b vgabios.cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios.cirrus.debug.txt
+       $(AS86) _vgabios-cirrus-debug_.s -b vgabios-cirrus.debug.bin -u -w- -g -0 -j -O -l vgabios-cirrus.debug.txt
        rm -f _vgabios-cirrus-debug_.s _vgabios-cirrus-debug_.c vgabios-cirrus-debug.s
-       mv vgabios.cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
+       cp vgabios-cirrus.debug.bin VGABIOS-lgpl-latest.cirrus.debug.bin
        ./biossums VGABIOS-lgpl-latest.cirrus.debug.bin
        ls -l VGABIOS-lgpl-latest.cirrus.debug.bin